From: nana-4 Date: Tue, 21 Jan 2020 12:49:58 +0000 (+0900) Subject: theme: Rename _app-switcher.scss to _switcher-popup.scss X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~777^2^2~46 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c7fb61984b47a873f30ffde8d7b340152810cbbc;p=gnome-shell.git theme: Rename _app-switcher.scss to _switcher-popup.scss Since the main classes in that file are not dedicated to the app switcher, rename it to something more appropriate. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/938 --- diff --git a/data/theme/gnome-shell-sass/_widgets.scss b/data/theme/gnome-shell-sass/_widgets.scss index 5df4ecd61..8f28929fc 100644 --- a/data/theme/gnome-shell-sass/_widgets.scss +++ b/data/theme/gnome-shell-sass/_widgets.scss @@ -27,7 +27,7 @@ @import 'widgets/network-dialog'; // OSDs @import 'widgets/osd'; -@import 'widgets/app-switcher'; +@import 'widgets/switcher-popup'; @import 'widgets/workspace-switcher'; // Panel @import 'widgets/panel'; diff --git a/data/theme/gnome-shell-sass/widgets/_app-switcher.scss b/data/theme/gnome-shell-sass/widgets/_app-switcher.scss deleted file mode 100644 index 2406e17e2..000000000 --- a/data/theme/gnome-shell-sass/widgets/_app-switcher.scss +++ /dev/null @@ -1,55 +0,0 @@ -/* App Switcher */ - -.switcher-popup { - padding: 8px; - spacing: $base_spacing * 4; -} - -// switcher onscreen panel -.switcher-list { - @extend %osd_panel; - - .item-box { - padding: 8px; - border-radius: $base_border_radius + 1px; - border: 1px solid transparent; - - &:outlined { - border: 1px solid darken($borders_color,5%); - background-color: transparentize($osd_fg_color, 0.9); - box-shadow: inset 0 2px 2px 0 rgba(0,0,0,0.4); - } - - &:selected { - background-color: transparentize($osd_fg_color, 0.9); - color: $osd_fg_color; - } - } - - // window thumbnails - .thumbnail-box { - padding: 2px; - spacing: $base_spacing; - } - - .thumbnail { - width: 256px; - } - - .separator { - width: 1px; - background: $borders_color; - } - - .switcher-list-item-container { - spacing: $base_spacing * 2; - } -} - -.switcher-arrow { - border-color: rgba(0,0,0,0); - color: transparentize($fg_color,0.2); - &:highlighted { - color: $fg_color; - } -} \ No newline at end of file diff --git a/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss b/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss new file mode 100644 index 000000000..2406e17e2 --- /dev/null +++ b/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss @@ -0,0 +1,55 @@ +/* App Switcher */ + +.switcher-popup { + padding: 8px; + spacing: $base_spacing * 4; +} + +// switcher onscreen panel +.switcher-list { + @extend %osd_panel; + + .item-box { + padding: 8px; + border-radius: $base_border_radius + 1px; + border: 1px solid transparent; + + &:outlined { + border: 1px solid darken($borders_color,5%); + background-color: transparentize($osd_fg_color, 0.9); + box-shadow: inset 0 2px 2px 0 rgba(0,0,0,0.4); + } + + &:selected { + background-color: transparentize($osd_fg_color, 0.9); + color: $osd_fg_color; + } + } + + // window thumbnails + .thumbnail-box { + padding: 2px; + spacing: $base_spacing; + } + + .thumbnail { + width: 256px; + } + + .separator { + width: 1px; + background: $borders_color; + } + + .switcher-list-item-container { + spacing: $base_spacing * 2; + } +} + +.switcher-arrow { + border-color: rgba(0,0,0,0); + color: transparentize($fg_color,0.2); + &:highlighted { + color: $fg_color; + } +} \ No newline at end of file diff --git a/data/theme/meson.build b/data/theme/meson.build index fdcb69fce..bc1821f36 100644 --- a/data/theme/meson.build +++ b/data/theme/meson.build @@ -8,7 +8,6 @@ theme_sources = files([ 'gnome-shell-sass/_widgets.scss', 'gnome-shell-sass/widgets/_a11y.scss', 'gnome-shell-sass/widgets/_app-grid.scss', - 'gnome-shell-sass/widgets/_app-switcher.scss', 'gnome-shell-sass/widgets/_base.scss', 'gnome-shell-sass/widgets/_buttons.scss', 'gnome-shell-sass/widgets/_calendar.scss', @@ -35,6 +34,7 @@ theme_sources = files([ 'gnome-shell-sass/widgets/_search-entry.scss', 'gnome-shell-sass/widgets/_search-results.scss', 'gnome-shell-sass/widgets/_slider.scss', + 'gnome-shell-sass/widgets/_switcher-popup.scss', 'gnome-shell-sass/widgets/_switches.scss', 'gnome-shell-sass/widgets/_tiled-previews.scss', 'gnome-shell-sass/widgets/_window-picker.scss',